Fix iterating over children in form builder #6694
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
AdminHelper::getChildFormBuilder() method was iterating only over the first level of form builder. It is needed a RecursiveIteratorIterator for a tree traversal as AdminHelper::getChildFormView() method does. It also fixes FormBuilderIterator prefix property when traversing children, now the current prefix is passed to the children to create its key.
franmomu
force-pushed
the
fix_form_builder_iterator
branch
from
c471efd to
e6616fc
Compare
VincentLanglet
previously approved these changes
Dec 10, 2020
greg0ire
reviewed
Dec 11, 2020
franmomu
force-pushed
the
fix_form_builder_iterator
branch
from
e6616fc to
993c95b
Compare
Changes mocks from stubs when these mocks do not have any expectation.
franmomu
force-pushed
the
fix_form_builder_iterator
branch
from
993c95b to
47afea9
Compare
VincentLanglet
approved these changes
Dec 11, 2020
greg0ire
approved these changes
Dec 11, 2020
|
Thanks @franmomu ! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Subject
Triggered by #6689 (comment)
AdminHelper::getChildFormBuilder()method was iterating only over the first level of form builder. It is needed aRecursiveIteratorIteratorfor a tree traversal asAdminHelper::getChildFormView()method does.It also fixes FormBuilderIterator prefix property when traversing children, now the current prefix is passed to the
children to create its key.
I am targeting this branch, because this is a bugfix.
Changelog
When merging with
4.x, https://github.com/sonata-project/SonataAdminBundle/pull/6533/files#diff-743b4f55ec26cc7163d9150b5f5e8f1b40a0fbd4338f84b36dc2067ab3507b98L88 should be reverted (add$this->key()argument).PS: The variable change from
$formBuilderto$currentFormBuilderis because$formBuilderis the name of the parameter in the function.